Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into udc-qpr-dev am: 420c2c93

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



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