[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: 98921ea2 -s ours am: 83841036 -s ours am: d181990b -s ours am: 6c854406 -s ours am: 4041fa3b -s ours am: 241a0c05 -s ours

am skip reason: subject contains skip directive

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



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