[automerger skipped] Merge "Add feature flag for...

[automerger skipped] Merge "Add feature flag for disallow_cellular_null_ciphers" into main am: 63ed3a0f am: dbb58f32 am: d5e88324 am: 99080fc1 am: 8e8d740e -s ours

am skip reason: Merged-In I81b8f4f42bafc1adee139b35cc111dc852c4d2a2 with SHA-1 5fc9dc6c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2740733



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