Merge changes from topic "am-0e05468c9c40434a8715c6cb5c8f9f31" into...

Merge changes from topic "am-0e05468c9c40434a8715c6cb5c8f9f31" into tm-d1-dev-plus-aosp am: 99964d52 -s ours

am skip reason: Merged-In I12348bd913f724c4675177ce6cdf582948d9d03c with SHA-1 b91d60cd is already in history

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



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