[automerger skipped] Merge changes Id104edb5,Ie12b72b2 am: c17d5a14 am:...

[automerger skipped] Merge changes Id104edb5,Ie12b72b2 am: c17d5a14 am: c8787faa am: 891f163d am: 9e55513a am: 2330a81a -s ours

am skip reason: Merged-In Id104edb5543dc7e50ef75e26fab7d8cdfff596f4 with SHA-1 594558db is already in history

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



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