Merge "Remove package biometric2 from AOSP settings" into main