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

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



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