Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into...

Merge changes from topic "am-612047d859854ab9aefcf7ca10023e1a" into udc-qpr-dev-plus-aosp am: 3983c27e -s ours

am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 aa9f41a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718



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