[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE: Remove...

[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into lollipop-mr1-cts-dev am: 86251082 -s ours am: 270ab191 -s ours am skip reason: subject contains skip directive skipped: 92d2ef13 skipped: skipped: c0faa868

Change-Id: I5723c9cec49ee05460953c98a7de808b0cf1620d