Merge "Removed old data stack" am: 7bff34d89a

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

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