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

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c2 -s ours am: 3b8290a8 -s ours am: 7d29675e -s ours am: e7ef06df -s ours am: a0dc510a -s ours am: affb156d -s ours am: 4c47563c -s ours am: dd8bc29d -s ours

am skip reason: subject contains skip directive

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



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