Merge changes from topic "presubmit-am-df2061cd98404dc2b8691273679d233e" into tm-mainline-prod am: b4434081

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



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