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

Merge changes from topic "presubmit-am-e88e8e0dae0a4422865915229191c4a9" into sc-v2-dev-plus-aosp am: 6407ef69 am: bbb748e1

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



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