Merge "Remove the tethering hiddenapi whitelist entry"