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
am: 81efd59ed7

Change-Id: Ib8e1b7df0d85c960f028c9db98554a935d068d27