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: 0b98baac

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

Change-Id: I185e34d5d17e18bc9d6269d8766e874b5cd13330