[automerger skipped] Merge "Add register_nsd_offload_engine to flags.aconfig" into main am: efffa949aa am: 1114254ffa -s ours

am skip reason: Merged-In Id4d4b29f86e80aae170df49c668c4fd3ade4863d with SHA-1 158cdccf43 is already in history

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

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