Merge changes from topic "am-027818e7372d42dfbf66d1dde38209b5" into android12-tests-dev am: 21707d05

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



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