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

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

Change-Id: Ifc619a68d32a37c8dbb2b73ab17fe97ef226a72d