Merge changes from topic "presubmit-am-6e44f7e2535949bca0911680f5db1122" into...

Merge changes from topic "presubmit-am-6e44f7e2535949bca0911680f5db1122" into sc-v2-dev-plus-aosp am: 0306b0b0 am: 7b8bfe7b am: 5f4130d8

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

Change-Id: Ib0050b02f97fa98a69e6267ebf1a3d79422a7e40