[automerger skipped] Revert "DO NOT MERGE temporarily disabled new data stack" am: 9086501371 am: dbd34a078d am: 46d4b3e9bb am: ec868cf7d1 am: 46ea4ee17d -s ours

am skip reason: subject contains skip directive

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

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