Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 701dd4afdb am: 28607be85f

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

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