Merge changes from topic "lockdownvpnmainuser" am: 30eb7379

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



Change-Id: I3fcfb032e6d7e219a77e4739f90dfb7528917583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>