Merge changes from topic "VPN_APPOPS" am: 357179542a

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

Change-Id: Ieae51031b10795d79c84f128efa9f61d1fe8b757