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

Change-Id: I9b712f872472438ef234e5505c85f78225f4a221