tree 657d486e3bfa9ea5869aca882050453143a1211b
parent 2dd22a060aab89314e16073f826e266c63b1a11f
parent e6ee0ba1ca55c6d77099d5fb3c418354b0e3bc83
author TreeHugger Robot <treehugger-gerrit@google.com> 1654168696 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654168696 +0000

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Idd1b1e42bacbb74d950d9aa9a367b0f3a9fe176c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>