[automerger skipped] Merge changes Ic7265bd0,I9420d3a4 into stage-aosp-master...

[automerger skipped] Merge changes Ic7265bd0,I9420d3a4 into stage-aosp-master am: 4c9ec513 am: 6c409a93 am: 41eb66c4 -s ours am: 99a03678 -s ours

am skip reason: Merged-In Ic7265bd09556ab7dd0660df5b307d151abace503 with SHA-1 ecbf2ee4 is already in history

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



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