Merge "Obfuscate account name in account manager logs and dumpsys."