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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43