[automerger skipped] Merge changes I7e37a289,I1149f37f into udc-qpr-dev am: a59116ea -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: Ib3e3c64bb3de7260dc8ff3c27250d46cce7b952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>