Merge "Annotate MediaSessionManagerTest.testIsTrustedForMediaControl_withInvalidUid"