Merge "Fix media control flash when unlock device" into tm-qpr-dev am: b272ead9 am: a40fb535

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



Change-Id: I26f71f5a0ffd9060f3e0ad7ee6da4fee9144f52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>