[automerger skipped] Merge changes I9f17f30c,If43e43bc into tm-qpr-dev am: 21008abbf2 am: 22b00f64dd -s ours

am skip reason: Merged-In I9f17f30c5ad8d237246c850d33ab575bc996457c with SHA-1 955d555718 is already in history

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

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