[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 820b2504f3 -s ours
am: 2d53e9d2ab
Change-Id: I22884779bd6b3432374ddc52c742e2703d5ad5dd
This commit is contained in: