[automerger skipped] Added setup/tear down data support am: 932a4d88 am:...

[automerger skipped] Added setup/tear down data support am: 932a4d88 am: 87b6d085 -s ours am: 37f37e7f -s ours am: 46665f95 -s ours

am skip reason: Merged-In Idf5c5c4cfabc7fa62767dc80d459a6245d548413 with SHA-1 00e2a5cf is already in history

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

Change-Id: Ia1887ab1cfe149aa1f48a2547ab606c1ebb72b8a