am c085b3ee: Avoid long running upgrade work on the main thread
Initial implementation of the directory API

Change-Id: If8cb0a1fc32dba0ac47502d9f86b43e0e0add8b8
Merge commit 'd3d812af96f7d77e13dc60652626b39f25907147' into HEAD

* commit 'd3d812af96f7d77e13dc60652626b39f25907147':
  Initial implementation of the directory API

Conflicts:
	src/com/android/providers/contacts/ContactsDatabaseHelper.java
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