Merge "Fix 2673731: Adding support for password history to the Device Admin Sample App."