Merge "Split enabledForApp & enabledOnKeyguard settings for FP and Face" into main