Merge "Revert "DO NOT MERGE temporarily disabled new data stack"" am:...

Merge "Revert "DO NOT MERGE temporarily disabled new data stack"" am: 003d08c7 am: 3d0e42a8 am: 0e6740f3 am: e6985d3e

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



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