[automerger skipped] Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 8716ebc4d4
-s ours
am skip reason: Merged-In I945490ef1e62af479a732c9a260ed94bdd8bc313 with SHA-1 f8b664e31f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ibb779034ce7f49a26a84989e6e59600bf35ac905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: