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

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