Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756



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