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

[automerger skipped] Merge "Revert "DO NOT MERGE temporarily disabled new data stack"" am: 003d08c7 am: 3d0e42a8 am: 0e6740f3 am: e6985d3e am: b306f391 -s ours

am skip reason: subject contains skip directive

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



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