[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: bdf20659 am: 0aeb6102 am: e414bdfa -s ours am: a0fd4b8b -s ours am: b503d8c3 -s ours am: 8986814a -s ours

am skip reason: Merged-In I9f95e7424e6e74af12a0f6780a58fb5732df7300 with SHA-1 abbaf551 is already in history

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



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