Merge cherrypicks of [20269702] into tm-qpr1-release. am: bc818fd392

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/20318170

Change-Id: Icaa4fc3461c50984022f75fb9f8d3f26798a360f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 3a59da4d0a2767b2506370862efb40c415317b94
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS