[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 34042bbf1d
-s ours am: 2095ac82c4
am: 303429eb26
-s ours
am skip reason: subject contains skip directive
Change-Id: I8b275f8c7e6fc3bd9a86c0a442aba3009521cc6f
This commit is contained in: