Merge "Merge "Replace 'use fingerprint to open'" into sc-dev am: bafe3db8 am: f6b96595" into sc-v2-dev-plus-aosp