Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev am: 7a3593d0b6
am: 455dac3ab6

Change-Id: Id4c58987d0b75045d4ac2e9a46b3bd52f4ba3294