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