[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-qpr-dev am: 63d6d79a -s ours am: c8c490b9 -s ours am: 14b4bda0 -s ours am: 204b27dc -s ours

am skip reason: subject contains skip directive

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



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