Merge changes from topics "data_settings_manager", "tnf_migrate" am: 354102ce86

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

Change-Id: I0a5da1606e3168ec365ac84a9ffd31b15021c57d