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

Merge changes from topic "presubmit-am-e37767a8acfc463f909997fa16058fda" into tm-mainline-prod am: 33842616

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



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