[automerger skipped] Merge changes from topic "am-21ce8922bf5e498bb030b1c2a53f476d" into android12L-tests-dev am: e37b15ad16 -s ours am: 71720334f7 -s ours am: 3a7fe554a2 -s ours am: a4af600f97 -s ours am: b5d17f2a8f -s ours am: 38c21e37d2 -s ours am: 5c93997afb -s ours am: 91d832c901 -s ours

am skip reason: Merged-In I3707d883d0daa4ffd2baa9bd69aebf4bf9ddef4e with SHA-1 82fa481114 is already in history

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

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