[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: 5041574a8d -s ours
am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 efc2b69c88 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: I38b7bf1dfc91dc712601abb42e52f84dded51036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: