Merge "Revert "Add UID and package name to TetheringRequest"" into main