[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev am: b918a5b479  -s ours skipped: ab3c2a1d5f skipped: ac1a4c6e25

Change-Id: I783ba6e453b8a919ed938208b486c80df33a5605