am 6a42c290: Merge "Delay AccountTypeManager init until we have the Contacts...
am 6a42c290: Merge "Delay AccountTypeManager init until we have the Contacts permission 1/2" into mnc-dev
* commit '6a42c290':
Delay AccountTypeManager init until we have the Contacts permission 1/2