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

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

Change-Id: I664fb1a7a6790dcdffc892308b112011cb569860