Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc4 am: ea9463f5 am: 66d66dd5 am: b2db3761 am: 32992b40" into nyc-mr2-dev-plus-aosp