Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed am: 2aa907fb

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

Change-Id: I2c9588cea7642dddaaa27318f8aa03c94bfaa229