Don't crash if a bad value sneaks in.

Change-Id: I4e45f7a8b374aa56b763cc3e75f7a310a90bb417
Import translations. DO NOT MERGE

Change-Id: I636bfe68280d8b2b4c82a770befbf14a371e4af2
Auto-generated-cl: translation import
am 32067cd5: (-s ours) Import translations. DO NOT MERGE

* commit '32067cd53562f97215eca16a0e0acc39abf32252':
  Import translations. DO NOT MERGE
am e3618dce: Reconcile with jb-mr1-release

* commit 'e3618dce22a0ce18c181f33b71213502ac7346db':
am fd4037d2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fd4037d219ba5e5cfa8fb6ebe19dd6d375d94ed5':
am 9045d1df: am fce36486: Merge "Explicitly export content providers" into jb-mr1-dev

* commit '9045d1df57a95b00bf8a10acdf7c5a5bdf52e598':
  Explicitly export content providers
am 3bbf7c7e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3bbf7c7e75bb5ab181f778afc193f4fe598b733f':
am e71b1644: am b654c68a: [provider] Clean up unused code used to use for....

* commit 'e71b1644aa029820585ae00cc38c0b0d32906e1d':
  [provider] Clean up unused code used to use for....
am 4924a1b0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4924a1b027a1536c9dbd45497d54947f454f5232':
Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into aosp
am e5a09b0f: am 9bc20fb9: resolved conflicts for merge of 3646b108 to jb-mr1-dev

* commit 'e5a09b0f6e740feff34dcf0ec347c7721e9701c3':
  Sync HanziToPinyin tables with ICU 4.6.
am 718d707f: am e8956364: Merge "Don\'t leave stale normalized number when updating..." into jb-mr1-dev

* commit '718d707fb717b36bbacbce94d4e14f3942a94c01':
  Don't leave stale normalized number when updating...
am f074842f: am e530c055: Merge "Adding limit and offset parameters to calllog provider." into jb-mr1-dev

* commit 'f074842fc90889be3bda8c4288d9a9f110534c09':
  Adding limit and offset parameters to calllog provider.
am bb149f70: am c458f77c: Merge "Make "export contacts database" more secure" into jb-mr1-dev

* commit 'bb149f70be2e0478cef3692feda1ade2ba240282':
  Make "export contacts database" more secure
am 2d85ca3c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2d85ca3c91d43a7192363b24cf99eac60c7a7904':
Import translations. DO NOT MERGE

Change-Id: Ide4d1b27f08b595eb6e94599965b9d0bd8ad9cab
Auto-generated-cl: translation import
am bf60728e: (-s ours) am f109f24e: Import translations. DO NOT MERGE

* commit 'bf60728e80d52ab21d8351712eacc67327c3daf3':
  Import translations. DO NOT MERGE
Import translations. DO NOT MERGE

Change-Id: I12de2914e695d27a67e07ef3338094259b1792d6
Auto-generated-cl: translation import
am 8a0dc9cc: (-s ours) am 4fadf9d6: Import translations. DO NOT MERGE

* commit '8a0dc9cca3107308aef1d75b6d122f874b024725':
  Import translations. DO NOT MERGE
am 0dd3ecc9: am a6bef4a5: Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999

* commit '0dd3ecc99b4b1fcfb84a53e7b0faf7a4040ed4f4':
  Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999