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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b15 am: 677b43cb -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 efc2b69c is already in history

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



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