Merge changes from topic "lockdownvpnmainuser" am: 30eb7379 am: cf200064 am: 6c634f5c

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



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