[automerger skipped] Merge "FRP: save password quality in DPM.resetPassword" into pi-dev am: 96a1ec5944  -s ours
am: bb005c7963  -s ours

Change-Id: I0531d3d738ff74a7a05e014837dd62942221ca94