Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService" am: 5ce00f02e8 am: 3af5f0c1f8 am: 02dc008dcc

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

Change-Id: I50cadbdb0f28b1763121d01d5e3cbcb562b1758d