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

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



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