Merge "MediaSession2: Reject calls from a Controller that haven't allowed"