Merge "Inverted the new data stack flag" into tm-dev am: 601853b5

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



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