[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-29598c2c218b4da5bfc1fe3dacd197b3" into sc-qpr1-dev am: 46b97fcb -s ours am: 412a2ae8 -s ours am: 1a154583 -s ours am: b469b28d -s ours

am skip reason: skipped by user essick

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



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