[automerger skipped] Merge "Added several changes in data stack" am:...

[automerger skipped] Merge "Added several changes in data stack" am: ceca6040 am: d9259e57 am: 6d062153 -s ours am: 294885ee -s ours am: c038bafd -s ours

am skip reason: Merged-In I98604e1f08d75453e8af03157b0e673a10cbc56e with SHA-1 335de639 is already in history

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

Change-Id: I00748fab8fd922158132adb0cfacb53c92f3c1ba