Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba

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

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