Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev am: 48fe694ad4  -s ours" into oreo-mr1-cts-dev am: 8281e4781a  -s ours
am: 0cedf2c190  -s ours

Change-Id: I046516af35ff3de736d681efb3e83e2b2fe78072