[automerger skipped] Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 am: 961a73e0c3 am: 172bc952aa -s ours

am skip reason: skip tag Change-Id I3b88f22fffde3dd4000d28342ed07209c7121a37 with SHA-1 02ec9e9d4a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653934

Change-Id: Ia5e3703fea761ffa0b2f04316c4398fc87075841