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

[automerger skipped] Merge "Fix issues with setRemotePlaybackInfo" into tm-dev am: 9587fcef am: 720c7f78 -s ours am: 1d79264c -s ours am: cbd57286 -s ours

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

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



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