am e3243a31: am 6fbf6849: (-s ours) am 6a42c290: Merge "Delay AccountTypeManager init until we have the Contacts permission 1/2" into mnc-dev

* commit 'e3243a31e7aa1cec8c0903117a7da98c90346dd3':