[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 35b818e4f8
-s ours am: 401178c70f
-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: Id1024aa29342ac3cc2fca07a263a5a0ed4f1e7e4
This commit is contained in: