Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: 32992b4049" into nyc-mr2-dev-plus-aosp
am: c697ffe98b

Change-Id: I79d4ec95100e09eb6225cbfe900bceb357ee6b71