[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: c731ba07 -s ours am: a3c97f99 -s ours am: e14df1a3 -s ours

am skip reason: subject contains skip directive

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



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