[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude...

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a -s ours am: 4306517b -s ours am: 6b6765b1 -s ours am: 00bf4456 -s ours am: 8f0a0f76 -s ours am: 3dd9d1af -s ours am: 48e4eb80 -s ours

am skip reason: subject contains skip directive

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



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