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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143 -s ours am: 34cc50a4 -s ours am: 4876714b -s ours am: 7622520b -s ours am: 8e84da74 -s ours am: 1268ee08 -s ours

am skip reason: subject contains skip directive

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



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