Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 701dd4afdb am: 3d3e54aae7 am: c77885c461

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

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