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

* commit '335f043bdb20f3528f486ad91eb9e1fdf8f673ab':
  Add permission annotations on the AccountManager