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

Change-Id: Ib270b7780babef568fdb2d4e31e3dd860426a818