Merge changes from topics "detach_old_data_stack",...

Merge changes from topics "detach_old_data_stack", "presubmit-am-2b20dc34774e4a24849d1a5b7aaa801e" into tm-dev am: 4a8729b7

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

Change-Id: Ic75591a5f2dff05c9569ff94e61b670fb8c158d5