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