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

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

Change-Id: Ia3e89098764464304f210882ba41f176f259032a