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

Change-Id: Ib9b4bc6aed989783040c20b9c98e98c6cbda9688