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

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

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