[automerger skipped] DO NOT MERGE temporarily disabled new data stack am: cbd1ca59 am: 39e9b334 am: e9dac97a am: e751a151 am: e1068e60 -s ours

am skip reason: subject contains skip directive

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



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