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

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

Change-Id: I4c87d866ca567c716da55661a619906d5bcb29f1