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

Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-qpr1-dev am: 591382df

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



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