Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8

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

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