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

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

Change-Id: I0e7fde049b5717cda0ae17816005ed8afc1b54d1