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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636 -s ours am: 91c3b175 -s ours am: 3029dc01 -s ours am: ed968a1c -s ours am: 324233db -s ours am: 693a6c22 -s ours am: 7718d7a5 -s ours am: 73d0008b -s ours am: 5d3e350b -s ours

am skip reason: subject contains skip directive

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



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