Merge "Merge "[Media ML] Sync with original implementation" into rvc-dev am: 018afaae am: fcc1e278" into rvc-d1-dev-plus-aosp am: c597076a

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

Change-Id: I3b747d9cffcfa33852543f83c116b253bda7f099