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

Merge "[automerger skipped] Merge "Completely detach old data stack" am: f2b55a0e am: 3a82e4fb -s ours am: 665b66ed -s ours" into tm-d1-dev-plus-aosp am: 5d7e3f19 -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: I0ea696743c86a0bceb699b1f26f71e1b56fcf0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>