Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService" am: 5ce00f02e8 am: 3af5f0c1f8 am: 02dc008dcc am: 966b5c7f29 am: 15221cbc4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845997 Change-Id: I779aa38536f45ac887d54d5ec9298c0347c4e176
This commit is contained in: