[automerger skipped] Merge "Default unit tests to use new data stack" am:...

[automerger skipped] Merge "Default unit tests to use new data stack" am: 12b8e089 am: 02ed8131 am: 631a9409 -s ours

am skip reason: Merged-In Id4f531a8d5ea4e02f8f85bf7753de6455104ae81 with SHA-1 a4397b6b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2060528



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