[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 820b2504f3 -s ours am: 2d53e9d2ab
am: 3b960a8dea -s ours
am skip reason: subject contains skip directive

Change-Id: I1a64dc4665591e820915f2046a7e8da518f3503e