Merge "Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
am: e6ee0ba1ca
am: 1ef5a1c86a
am: fbae601cb2" into tm-d1-dev-plus-aosp am: a0793dd4e1
am: 27785346c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869 Change-Id: I9e8d17abd61055e96b193c5c2a78e9f58ea347f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: