[automerger skipped] Merge "Completely detach old data stack" am: f2b55a0e...

[automerger skipped] Merge "Completely detach old data stack" am: f2b55a0e am: 3a82e4fb -s ours am: 665b66ed -s ours am: dc07a40c -s ours

am skip reason: Merged-In Ice595f329e2f4e531dc577cd3db7c863ba15d6d6 with SHA-1 c2382270 is already in history

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



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