Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev