DO NOT MERGE Simplify password checking logic

(cherry-picked from commit aaccfac3442ab48f5f94603c07427cc1bb00e12d)

Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
1 file changed