[automerger skipped] Removed old data stack am: 3700fd28 -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: I11c63efaa63af4ed9774478ed5b1e4c8362f76b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>