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