Simplify password checking logic

Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
1 file changed