[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-ebf0c4a183434029abdd838752cea936" into tm-dev am: cea6ed11 -s ours am: 2e1c4cf6 -s ours

am skip reason: Merged-In Icf6d00491438176e9092b67974a9388e803ac130 with SHA-1 530a22aa is already in history

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



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