Android l-preview release 2
am 302ae3fd: Merge "Move Contacts off private ICU API."

* commit '302ae3fdc38a90233c958269765f5a6e52a1a0cf':
  Move Contacts off private ICU API.