[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2
-s ours am: 44427259e8
am: 4afd567d8d
-s ours
am skip reason: subject contains skip directive
Change-Id: I0734c123fb365bccad8bdd124ada568e46e963d3
This commit is contained in: