Merge "Revert "DO NOT MERGE temporarily disabled new data stack"" am: 003d08c7fd am: 3d0e42a89e am: 0e6740f328

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

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