Merge "Remove the usage of hidden API - setIsAvailable() from Vpn"