Merge changes from topic "am-5760149da6b0457982391b0ccd4458ef" into...

Merge changes from topic "am-5760149da6b0457982391b0ccd4458ef" into tm-d1-dev-plus-aosp am: 84c77111 -s ours

am skip reason: Merged-In I61db64b279e4e64c9be33095bf98b3bbdb0e19d8 with SHA-1 7fd1802c is already in history

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



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