[automerger skipped] FRP: save password quality in DPM.resetPassword am: ef116def7c  -s ours am: b6fb68f7fd  -s ours
am: 5561b1bc27  -s ours

Change-Id: Ifc9c36d2a91f59c2cedd8e140a811a98ce2a8a7a