Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 am: 961a73e0c3

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

Change-Id: I577c40b2d5dfb4bb6c1d2471a66e47a95ddd1d77