[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
am: ff03ce88ff
am: 767ff4725e
-s ours
am skip reason: Merged-In I40974a26d170cf3eeec18e6a07a21f6c420eca9e with SHA-1 21c3bca13f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364
Change-Id: If3bbc8189551daa443a35a07c6e3521bbc92184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: