Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 4452f55a2e am: f8bac85e95 am: 2a0bb42e8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21c1c7913987a2bb4d486e6ce8da24a76ddf2dc6