Merge "Change robolectric genrule to host variant" am: 67a0c64481

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

Change-Id: I60de1720624c63c1656aebd2d38c030c6d4371e6