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: I09a6af004ae1a80ad35a6dddfa6bd4677d539da4