[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: c2c6cdd1 -s ours am: aee7da70 -s ours am: d1dee4da -s ours am: 7be14722 -s ours

am skip reason: subject contains skip directive

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



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