Merge "Enable null cipher toggle by default" into udc-dev am: 6593a98a am: 5c4da20b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22932736



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