Merge changes from topic "presubmit-am-44db3d50df73406ca90adbf25d7845c1" into tm-mainline-prod am: 96130914

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



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