Merge "[owners] Remove curtislb@google.com from src/com/android/settings/password/OWNERS" into main