Merge changes from topics "enable_new_data_default",...

Merge changes from topics "enable_new_data_default", "presubmit-am-19168ef09d5542b3b19f230396b120ce" into tm-dev am: f2e9edc7

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

Change-Id: If799a29c457a5eb515d2bef36b795f02467c5cec