[automerger skipped] Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8 am: 46fdc734de am: 41c590bf2d am: 322cab1407 am: f40d88261f -s ours

am skip reason: Merged-In I15c0196b4cbc6ac7324dcde82119b6e075333936 with SHA-1 8342767381 is already in history

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

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