Merge "Added command line tool to enable/disable new data stack" am: bdf20659 am: 0aeb6102

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



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