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

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea3472 -s ours am: a242d36b -s ours am: 571f185a -s ours am: 177c0705 -s ours am: 7bdf7eb2 -s ours am: 625f3293 -s ours am: 73064a13 -s ours

am skip reason: subject contains skip directive

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



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