Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into tm-dev am: d09d6f1da7 am: 03f6a5f253

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

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