Merge "Fix MediaEvent release issue" into rvc-dev am: c266b039 am: 4c42e15d am: d3d6d267 am: a9061a83

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

Change-Id: I1ea1521181f97a5680d374a1865552a7401a6a71