Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am: 40e284b196

Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad