Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev am: 86ed912f5a
am: 77b5ccb59b

Change-Id: I6de587d85c7ece9a20613ab935fca6f886dbc1c3