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

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

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