[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 34042bbf1d
-s ours
am: 2095ac82c4
Change-Id: I124662fa7bd0513fea6f7b8a6b2330835c6c386b
This commit is contained in: