Merge "MediaSession2: Ask server whether a controller is trusted" into pi-dev am: b9332a43b8
am: 7ef7f2fb7c

Change-Id: Ie66ed00a7303a7225f5667e4f8bb637612c7deb3