[automerger skipped] Merge "Added several changes in data stack" am: f469ab4961 am: f158fd0b0f am: ae264ca16f -s ours

am skip reason: Merged-In I99a833caac2f6f47a1fb6d050900c8fb2db3a8e3 with SHA-1 2c4509528d is already in history

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

Change-Id: Ia1c4492e90c1c6fddcf74f8583384f3c175d6e75