[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483

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