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

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



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