Merge cherrypicks of [8551866, 8551867, 8551868, 8552336, 8552337, 8552338, 8551869, 8552339, 8552376, 8551887] into qt-c2f2-release

Change-Id: I32d4a9bd37c3ca77d5f40d0baf2f5eaf19742782

src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java

@@ -33,6 +33,11 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC
 
     @Override
     public int getAvailabilityStatus() {
+        // Check if Face for Profile is available.
+        final int isAvailable = super.getAvailabilityStatus();
+        if (isAvailable != AVAILABLE) {
+            return isAvailable;
+        }
         // Make the profile unsearchable so the user preference controller gets highlighted
         // when searched for.
         return AVAILABLE_UNSEARCHABLE;