Merge changes from topic "presubmit-am-f038598b58a447c5b353312dcc5d9ed6" into...

Merge changes from topic "presubmit-am-f038598b58a447c5b353312dcc5d9ed6" into tm-mainline-prod am: 981b33be

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



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