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

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

Change-Id: I3955ebd8f24a83b2f0341b3aca8249c81f9c86c1