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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f -s ours am: e8b37815 -s ours am: 0ee52eca -s ours am: 6beebebf -s ours am: b7af8b41 -s ours am: e39b390b -s ours am: 29d509a9 -s ours

am skip reason: subject contains skip directive

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



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