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

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

Change-Id: I8ceaf8014bd761b801b60ea91d5c061accde5160