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

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

Change-Id: I2dbe6e23f033472f55d7191d13b00553fce90233