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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb3 -s ours am: 26068ce8 -s ours am: 4d517b48 -s ours am: b1e88e3d -s ours am: 34cb892a -s ours am: 08f1a5c8 -s ours am: 32c0b78c -s ours am: b5c6f4f6 -s ours am: a01de9f1 -s ours am: ff2dbbff -s ours am: 4c1127d1 -s ours

am skip reason: subject contains skip directive

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



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