Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5...

Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5 am: 46555d7f" into udc-dev am: 1125a000 am: 7faa569a

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



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