Merge changes from topic "presubmit-am-3403e266474c4051bfe60116a5736278" into...

Merge changes from topic "presubmit-am-3403e266474c4051bfe60116a5736278" into tm-mainline-prod am: 65f709c1

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



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