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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a -s ours am: a1797b33 -s ours am: d21ca322 -s ours am: c0a5820b -s ours am: 16e123f1 -s ours am: ad3b2878 -s ours

am skip reason: subject contains skip directive

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



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