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

Change-Id: I3e8eba4defa5a0d0405730efad330d113ec8195c