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

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



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