[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main...

[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f1 am: 3510cd0a -s ours am: 19f1b751 -s ours

am skip reason: Merged-In I40974a26d170cf3eeec18e6a07a21f6c420eca9e with SHA-1 ad565c49 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364



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