Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService"