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: a841d7fb am: 2188531f am: 9e5c44d0

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



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