Merge "FRP: save password quality in DPM.resetPassword"
am: 08d4eb174d

Change-Id: Ia119e21e7e6e2c4c674b66b0cfb863f085bf7980