Merge changes from topic "am-144bc4c012e9421c9e52671f3eb3ec58" into...

Merge changes from topic "am-144bc4c012e9421c9e52671f3eb3ec58" into udc-qpr-dev-plus-aosp am: 0d5966b5

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



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