Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard...

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev am: f65a8424  -s ours am: 8c8cfb63
am: 7d226f33

* commit '7d226f33':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I53d8077f6d236336b5824b4e9baa13f762282573