Merge "Merge "Use ICU\'s Calendar class in date picker & related classes" into...
Merge "Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca564 am: ffa81d04" into nyc-mr1-dev-plus-aosp
am: 2753194c
* commit '2753194c':
Change-Id: I597c0d693fde1d49c5a45d9eca4d5886350a81f8