Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8 am: 46fdc734de am: 41c590bf2d

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

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