[automerger skipped] Merge "Added command line tool to enable/disable new data stack" am: 2e182d8d52 am: 0d2d397dfb am: 8587a9ca59 -s ours

am skip reason: Merged-In I381d8d446d0754670fb317d8c8ffa0bf85530828 with SHA-1 4c0a550bba is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2053104

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