[automerger skipped] Revert "DO NOT MERGE temporarily disabled new data stack"...

[automerger skipped] Revert "DO NOT MERGE temporarily disabled new data stack" am: 90865013 am: dbd34a07 am: 46d4b3e9 am: ec868cf7 am: 46ea4ee1 -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>