Merge "MediaSession2: Avoid binding from system service if able"