[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: c680209d -s ours am: fe28a5d3 -s ours am: ba77b6f1 -s ours

am skip reason: subject contains skip directive

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



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