[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: 96aa5fc1 -s ours am: 2fcfc943 -s ours am: 2afb3fc4 -s ours am: 21f4dac5 -s ours

am skip reason: subject contains skip directive

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



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