Merge "Merge "Always treat password as sufficient if no password policy is set" into oc-mr1-dev am: f72a2f2c93" into oc-mr1-dev-plus-aosp