[automerger skipped] Merge "Removed old data stack" am: 7bff34d89a am: bde12062cf -s ours

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

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

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