[automerger skipped] Merge "Removed old data stack" am: 7bff34d8 am:...

[automerger skipped] Merge "Removed old data stack" am: 7bff34d8 am: bde12062 -s ours am: 3d4a71f6 -s ours

am skip reason: Merged-In I8e92c8f795c4ecfd71a3a642956fbb60711fb56e with SHA-1 3700fd28 is already in history

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



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