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 am: c38cdbff -s ours Change-Id: Ie10923cc54cae54fa830b4d81c123ee9a54422ee