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

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



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