[automerger skipped] Merge changes I7e37a289,I1149f37f into udc-qpr-dev am:...

[automerger skipped] Merge changes I7e37a289,I1149f37f into udc-qpr-dev am: a59116ea -s ours am: c77f9d02 -s ours

am skip reason: Merged-In I7e37a289f9c5f7773e500e59220963d1d17b5fb2 with SHA-1 7201785a is already in history

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



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