Merge "Merge "Merge "Fix CME in MediaDataCombineListener" into rvc-dev am:...

Merge "Merge "Merge "Fix CME in MediaDataCombineListener" into rvc-dev am: 4b389892 am: edaf9337" into rvc-d1-dev-plus-aosp am: 0a4f8bd7" into rvc-qpr-dev-plus-aosp am: 6aa40d5a

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

Change-Id: Ic2ffa1d1d5b9676ddd0ea546310892aca0991bed