Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev
am: 734a8c9964

Change-Id: I103071ccf7e7a940edcb11400393593d50486ca9