[automerger skipped] Merge "Merge changes from topic...

[automerger skipped] Merge "Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into tm-dev am: 5c59ddbb am: 546f0285" into tm-d1-dev-plus-aosp am: aa891cdc -s ours

am skip reason: Merged-In Ie3494d592e7b36629317ba51717b528dab13e0fb with SHA-1 2ebfe99b is already in history

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



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