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

* commit 'f60da396778a1b7dbca5424fdee9c179f34cd010':
  Delay AccountTypeManager init until we have the Contacts permission 1/2