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

* commit '6fbf6849d6faeccc98ad0ee3c59e63bd84eac0da':