Merge "Merge "[Media ML] Sync with original implementation" into rvc-dev am: 018afaae am: 68f269d7 am: a06cd10b" into rvc-qpr-dev-plus-aosp am: bcbe5d78

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

Change-Id: Ied0e30379ad4aa8ccc2b4956163463eb4dc1af83