[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: 1b4a91414e -s ours am: 00682396b3 -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: Ibacc48f6e26ae5d7d5c2522d08c27b7b47b8f7e5
This commit is contained in: