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