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

Change-Id: Ia8e21b690d4966e3334db646d12bfe7e2bad4151