Merge "Revert "Enable new data stack by default"" am: f92fa673da

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

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