[automerger skipped] Merge changes Ia7b57ed5,I7e37a289,I1149f37f am:...

[automerger skipped] Merge changes Ia7b57ed5,I7e37a289,I1149f37f am: fc03254c am: 91a925fb am: 7e394752 am: 67f79da0 am: 883ce65a am: 64db11df -s ours

am skip reason: Merged-In Ia7b57ed51a5aaba8b4f4bd2108a197f73926180f with SHA-1 55e99fba is already in history

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



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