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

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

Change-Id: I40e6474dcf25161e023ded2db47339e761442174