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

Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into sc-qpr1-dev am: 34272b34

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



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