Merge "Add permission annotations on the AccountManager" into mnc-dev