[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: fc2945ab -s ours am: f863a5e4 -s ours

am skip reason: Merged-In I041d1b146afdffa0ba62b604a8fe6c0f59e1ddd9 with SHA-1 20d04e3b is already in history

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



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