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

Merge changes from topic "presubmit-am-d381d468481e4f5fb712df3e083a8166" into tm-mainline-prod am: f403737c

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



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