Merge "Merge "DO NOT MERGE: Remove test that depends on tz data" into...
Merge "Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev am: 4b2992e9 -s ours"
am: 835b9eeb -s ours
Change-Id: I10dbe20fccecf7bae96964c1b3741ca3599c30e0