Merge "Fix paused player glitch on lock screen" into rvc-dev am: 9aeedae3a1 am: 41a860e1a8 am: baf68170aa

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

Change-Id: I052362379a1e60c2f09eef156ec033005b55b07f