Merge "Completely detach old data stack" am: f2b55a0e

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



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