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 am: 1e1d9662
am: f42bfad2  -s ours

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

Change-Id: Ica43b29d19b3a793f507234a5427f9c06967db69