Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev am: 990d25bd am: b79536e0 Change-Id: I9e60b61c5141f4e58dbed3a1c7f450f7932acf9f