am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev

* commit '7a560701fda09522c5da1212d5ad8e3d81780c7c':
  Add permission annotations on the AccountManager