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

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6f am: 5041574a -s ours am: f7275110 -s ours am: 13cbc11d -s ours am: 173df057 -s ours

am skip reason: subject contains skip directive

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



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