Merge "Change robolectric genrule to host variant" am: 67a0c64481 am: 2459a9bd65 am: 5e652d5f72

Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1367132

Change-Id: I8908b27cddb1206168b4c1fa78e503183d790a53