[automerger skipped] Merge changes from topic "fix-b-284010885-align-aosp" am:...

[automerger skipped] Merge changes from topic "fix-b-284010885-align-aosp" am: 30bfc69f am: 63cdca36 am: 92b6a349 -s ours am: 3ca7cf6f -s ours am: 33f8e8f4 -s ours

am skip reason: Merged-In I72ff69abc09d8017564bf8f811b5586aab9ebdec with SHA-1 8d7fd5a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2603152



Change-Id: I3d28a96836c12ad1482446091fb2c8077c396d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>