Merge "[manual merge] [automerger skipped] RESTRICT AUTOMERGE:...

Merge "[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" into udc-qpr-dev-plus-aosp am: f309bafd

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



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