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