[automerger skipped] Merge "Enable new data stack by default" am: d422089d...

[automerger skipped] Merge "Enable new data stack by default" am: d422089d am: 92210365 am: c801888f -s ours am: b652c290 -s ours am: 207b96f0 -s ours

am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d1 is already in history

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



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