Merge changes from topic "am-310418a8696a406d860018e40222ecf1" into...

Merge changes from topic "am-310418a8696a406d860018e40222ecf1" into udc-qpr-dev-plus-aosp am: b7d7d4bb -s ours

am skip reason: Merged-In I255cd68b7641e96ac47ab81479b9b46b78c15580 with SHA-1 5825299c is already in history

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



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