Merge "[automerger skipped] Merge Android 13 QPR1 am: 3c65a98e00 -s ours" into stage-aosp-master am: 59602194dc -s ours am: dec064527c -s ours

am skip reason: Merged-In I935238092ce4f80e5da42aaf181e4b3a516b4b98 with SHA-1 7691825339 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2338409

Change-Id: If3a54321943f537dc1db4b3a72fbfe6a68eac84e
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 03510d0bcaa660fb6aed05b38c76c29dca7b273b
  1. apex/