[automerger skipped] Merge "Revert "Enable new data stack by default"" am:...

[automerger skipped] Merge "Revert "Enable new data stack by default"" am: f92fa673 am: a1f8e1c5 am: a08368b3 -s ours am: 1ed5bbda -s ours

am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d1 is already in history. Merged-In was found from reverted change.

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



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