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

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

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



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