Merge changes from topic "presubmit-am-5bc4d37628d64d179152518d84fbc382" into...

Merge changes from topic "presubmit-am-5bc4d37628d64d179152518d84fbc382" into tm-mainline-prod am: bc817068

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



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