[automerger skipped] Merge changes from topic "am-86c0ae89e3c847c8a473d59d272871a3" am: 16575d719e -s ours am: 99b211ab7d -s ours am: c76471dcb0 -s ours am: 89781fbcd5 -s ours

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

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

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