Merge "AccountManager: fix residue data when authenticator is uninstalled." into nyc-dev