Merge "Remove vishwath@google.com from core/java/android/service/trust/OWNERS" into main