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

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45 -s ours am: 97b5b9ac -s ours am: 34de4bb4 -s ours am: a1a4bd23 -s ours am: 09e0cded -s ours am: 7b68ff15 -s ours

am skip reason: subject contains skip directive

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



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