[manual merge] [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider:...

[manual merge] [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c2 -s ours am: 3b8290a8 -s ours am: 7d29675e -s ours am: e7ef06df -s ours am: a0dc510a -s ours am: affb156d -s ours am: a2f4bceb -s ours am: c9391002 -s ours am: dabfd4e7 -s ours am: 0f9fbc12 -s ours -s ours

Change-Id: Id917e6a108a1ecc851c3d43488afb3679bbb0717