[automerger skipped] Merge changes I7f94932e,I9a20008d am: f1c5329c am:...

[automerger skipped] Merge changes I7f94932e,I9a20008d am: f1c5329c am: 9cd52ba9 -s ours am: fcf3e3ca -s ours am: 188c3e4e -s ours

am skip reason: Merged-In I7f94932e135fcb5f194ed85b75e4b1234d1d2903 with SHA-1 a367cb21 is already in history

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



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