Merge "Delay AccountTypeManager init until we have the Contacts permission 1/2" into mnc-dev