[automerger skipped] Merge "Removed old data stack" into tm-qpr-dev-plus-aosp...

[automerger skipped] Merge "Removed old data stack" into tm-qpr-dev-plus-aosp am: ce380961 -s ours

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

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



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