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

Change-Id: I68dc3538393c51c2055535eb55587ebb7b697ba7