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

Change-Id: I2933c572f9960dc1d39c7608c99914d79a06acff