[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2
-s ours
am: 44427259e8
Change-Id: I6dd5016aa9636457b740f92f3770e5b5a69d4c78
This commit is contained in: