[automerger skipped] Merge "Enable new data stack by default" am: d422089d89 am: 92210365e1 am: c801888f8c -s ours
am skip reason: Merged-In I6d22205b733cb5d579b8da6f1e66f31437b20db1 with SHA-1 616898d167 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051832
Change-Id: I86de3d940e6d5d6d817de0b01a83f972880c975c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: