Merge "Switch pattern/PIN constants to match values in cryptfs.h" am: 92f5db4a06 am: 6d418929f0
am: a2c5a6b3c2

Change-Id: I93c28ad038ce7bf45e7eff8a1754272a1669ed67