Merge "Make UIDs match in GestureLauncherServiceTest." into main