Merge changes from topic "VPN_APPOPS" am: 357179542a am: 1d6536fda4

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

Change-Id: I1b8dc8856e8f103cd931b5993320b07f2ee767ca