Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
am: 544e628e16

Change-Id: I2df5b364bbfde27299d5f5114224dd6bfaeaa782