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

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

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

Change-Id: I5814b35558234036432bea6c8d3a8fd7c8bc9a4d