Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into tm-dev am: d09d6f1d

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



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