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

[automerger skipped] Merge "Changes tree built Robolectric name" am: 40660d21 -s ours am: d5eadda1 -s ours

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

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

Change-Id: I07a69de51ca021b434d4b15f58d0bd2ff115290c