[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 147f4bc01d
am: 29e46bd01e
-s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Iee0c4d11b50cacf090a80efe07137582c517e19b
This commit is contained in: