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