Merge "Include all accounts in dumpsys." into jb-mr1-dev