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

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 30d1770d -s ours am: b316efb7 -s ours am: 61bc051b -s ours am: 6b25ef9f -s ours am: 682110eb -s ours am: a194d55e -s ours am: 85ec73e3 -s ours

am skip reason: subject contains skip directive

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



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