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

Change-Id: I5ce921cb9c1ca0f27424ceb84e49793bb2c81d5d