Android CTS 5.0 release 6
Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev