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

Merge changes from topic "presubmit-am-d589b3c0f6fc4255932ef5d96aff7719" into tm-mainline-prod am: 09a003a1

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



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