Merge "Make MediaPlaylistAgent updatable" into pi-dev
am: 32edcf9e0e

Change-Id: Id1463a00658b18ca217718cb1ef89ddb3c7dfcca