Merge changes from topic "presubmit-am-12465bf3aa654d4e8e6a1c81a9a13253" into tm-mainline-prod am: 6a4a6948

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



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