Merge "Remove cbrubaker from core/java/android/service/trust/OWNERS" into main