Merge "Rename net-utils-tethering to net-utils-connectivity-apks." into main