Merge changes from topic "presubmit-am-e88e8e0dae0a4422865915229191c4a9" into...

Merge changes from topic "presubmit-am-e88e8e0dae0a4422865915229191c4a9" into sc-v2-dev-plus-aosp am: 6407ef69

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



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