Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177

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



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