[automerger skipped] Merge changes Ie755c7c2,I2259105e am: d387cf7c am:...

[automerger skipped] Merge changes Ie755c7c2,I2259105e am: d387cf7c am: fac82021 am: 25c52751 -s ours am: e5ac2217 -s ours

am skip reason: Merged-In Ie755c7c29fb73c97f815b1f6f0056c5a116e7965 with SHA-1 66fc0bd5 is already in history

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



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