Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev
am: b156c3a006

Change-Id: I7453311ceb4547f18055b2856965d8f30f918f16