Merge "Merge "Replace 'use fingerprint to open'" into sc-dev am: bafe3db841 am: 04ca9295d4" into sc-v2-dev-plus-aosp