[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev am: b918a5b479  -s ours" into nougat-cts-dev am: 1ff89cae94  -s ours skipped: 2dcd1654e2 skipped: b117e87425 skipped: b0bc62b50b

Change-Id: I814a6a37fed736d9f77203cc9189dc4660da1f05