[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
am: 5d9189fab2 -s ours
am skip reason: subject contains skip directive

Change-Id: Id431f40576a5375d541b4b41d2880ac0c9ac7519