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

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