Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev...

Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0f am: e3bbadb7 am: 6fd7cf19 am: 165c11c0 am: 2e68c87a am: 295de220 am: 4860d558 am: 9813fb3c am: 7bca95ea

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



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