Merge changes from topic "am-b023c4441e584a90b106107a6621cd5d" into...

Merge changes from topic "am-b023c4441e584a90b106107a6621cd5d" into tm-qpr-dev-plus-aosp am: 05d21931 -s ours

am skip reason: Merged-In I940655c39a3ae58839521416abafaf461df44921 with SHA-1 28f089d9 is already in history

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



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