[automerger skipped] Merge "Added command line tool to enable/disable new data...

[automerger skipped] Merge "Added command line tool to enable/disable new data stack" am: 81185e2b am: b7640c40 am: 7bc34e07 -s ours am: 92840a5f -s ours am: bc726968 -s ours

am skip reason: Merged-In I82993a8493065b16fd5e1b323c06dff44a457ba9 with SHA-1 c1c14bb1 is already in history

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



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