[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-9e1f951c22e9490883f7d9a8a294cf2f" am: 95e454c0 -s ours am: 75bae56d -s ours

am skip reason: Merged-In I840068aa1ba5ea3b19b855347d45221875b773e9 with SHA-1 4d21ce0d is already in history

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



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