[automerger skipped] Merge "Changes tree built Robolectric name" into...

[automerger skipped] Merge "Changes tree built Robolectric name" into stage-aosp-master am: 086cb94b -s ours am: 48aa9cb5 -s ours am: 039bf593 -s ours

am skip reason: Merged-In If13583f6a2882e2e78d3004afc476debf6692df9 with SHA-1 d6d46994 is already in history

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

Change-Id: Idb43539ebbcfc6ee8dbd005fce52b953c154797e