[automerger skipped] Merge "Add isNullCipherAndIntegrityEnabled to RIL" into...

[automerger skipped] Merge "Add isNullCipherAndIntegrityEnabled to RIL" into udc-dev am: a058dd53 am: 8dc778c0 am: e44a2845 am: 52df2d3a -s ours

am skip reason: Merged-In I1129e21695163535ec77dbafaf60c56c2346c707 with SHA-1 eb109f25 is already in history

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



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