Merge "MediaSession2: Change isTrusted() usages to isTrustedForMediaControl" into pi-dev am: 0c2e723765
am: 93b863e7d5

Change-Id: I39d8f5c269a355ea68b73968c2422cdcb7fcea24