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

Change-Id: I6eb0b99b9fbd25ed8f189cbc914a9a3bd7cb3069