Merge "Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 am: 773aad9835" into rvc-qpr-dev-plus-aosp