[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
am: 34042bbf1d -s ours
am skip reason: subject contains skip directive

Change-Id: I903bcc9500ea4732fdacd9f7c77538ba8390f34d