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

Merge changes from topic "presubmit-am-d9e2f1e8dae74427ad33ca70a7eb290f" into tm-mainline-prod am: 89bf955c

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



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