[automerger skipped] Do not let guest user disable secure nfc am: a579ca75...

[automerger skipped] Do not let guest user disable secure nfc am: a579ca75 am: 10090541 am: b8541679 am: 05dfb08c am: 35b818e4 -s ours

am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca75 is already in history

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

Change-Id: I4174c09fc219ee813fc74264c0e7dbc696eceda1