Merge "Added several changes in data stack" am: f469ab4961

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2007850

Change-Id: I01f11e46c58c2883a880302185e8c3789beaf18f