Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 482233a5be

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2829832

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