Merge "Bug 5300223 RemoteControlClient uses PendingIntent"