Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-qpr1-dev am: 591382df54 am: d2af9f4033 am: b2dba023e0

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

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