am 758a7562: Cleaning up the contacts DB during upgrade to version 203
In the simulator, everything runs as root, which causes a null pointer
exception in the contacts provider because PackageManager.getPackagesForUid()
returns null in that case.

Change-Id: Id64b5ae663b9df702752b3a5c27e3bef4e241c2c
Merge commit '6ff43a7545880f0b1c0f0a82b3551fb1d0dfa956' into HEAD

* commit '6ff43a7545880f0b1c0f0a82b3551fb1d0dfa956':
  In the simulator, everything runs as root, which causes a null pointer exception in the contacts provider because PackageManager.getPackagesForUid() returns null in that case.
Fix a trivial TODO, cleaning up an import.

Bug: 2417080
Change-Id: Iff73324d0f8f9d86e4e95998e4ab71d883fe8d0c
Fix NameNormalizer to only use public API.

Bug: 2417080
Change-Id: I2b055355eb4c293a91634f659e58c7592c60e38b