[automerger skipped] Merge changes Id389ff64,I51598ae1 am: 8c2ebfed am:...

[automerger skipped] Merge changes Id389ff64,I51598ae1 am: 8c2ebfed am: b1453af1 am: 95c09f6a -s ours

am skip reason: Merged-In Id389ff640b5f2d6a4adb49675db09ed6cbd758d2 with SHA-1 94dddd5e is already in history

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



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