[automerger skipped] Merge "Fix issues with setRemotePlaybackInfo" into...

[automerger skipped] Merge "Fix issues with setRemotePlaybackInfo" into tm-qpr-dev am: e3d6a610 am: 6d9bdf7a -s ours

am skip reason: Merged-In Ida43bb4acc34d666e354c16c4344d5c5eb6b333b with SHA-1 335a3cb7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22086618



Change-Id: I548d4dda553c92f428b625bc0d765d98814d0faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>