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

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



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