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

Merge "Enable null cipher toggle by default" into udc-dev am: 6593a98a am: 372f530c am: 4bddb570

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



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