[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6
am: 46bd9ba5a5
-s ours am: cd6ce52ea4
-s ours am: 7093dea7f7
-s ours am: 5163fd7aea
-s ours am: b3762ca5f4
-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/+/16691813
Change-Id: I4efdd94e0ea6979f90dc47df191412b177a2325a
This commit is contained in: