Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
am: 8f61acd8c2
am: cbeee15903
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240 Change-Id: I3cfc1e988490ccbf18884c564e710231d438c617 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: