[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-86c0ae89e3c847c8a473d59d272871a3" am: 16575d71 -s ours am: 99b211ab -s ours am: c76471dc -s ours am: 89781fbc -s ours am: 90f6900f -s ours

am skip reason: Merged-In Ie3cf7ca7ee46a1c3b783047a1385d9ffa57ebc09 with SHA-1 088bc6be is already in history

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



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