Merge "Merge "Fix MediaEvent release issue" into rvc-dev am: c266b039 am:...

Merge "Merge "Fix MediaEvent release issue" into rvc-dev am: c266b039 am: c32bb057 am: 046bc5d7" into rvc-qpr-dev-plus-aosp am: ac1c1de0

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

Change-Id: I44e26e8cef027c3b50bbea9bb28ec7829b22ac33