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

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

Change-Id: I9bbc69c02eec6075cfbcad88803d987bb884052b