Merge "Add test for verifying if setVpnDefaultForUids() is called correctly" into main