Merge "Do not check user escrow state if synthetic password is not enabled...
Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev am: b156c3a0
am: e95f0759 -s ours
Change-Id: Ieca67d0875caef9639beb576463f7af5a0eb750d