Merge "Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 am: 773aad9835" into rvc-qpr-dev-plus-aosp am: 38ff2d880f

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

Change-Id: I987c261fa60d74fb521d9faaf71c2c3acdda8466