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

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

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