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

Change-Id: I48bfc9548432bdf41021d956617b1b37cc3c46ff