[automerger skipped] Merge changes from topics "data_settings_manager",...

[automerger skipped] Merge changes from topics "data_settings_manager", "tnf_migrate" am: ec2adbf2 am: 248fdff3 am: f23e3c3d -s ours

am skip reason: Merged-In I8fed882f180f8e418b7feab980ac00d9d22eca58 with SHA-1 a7941ec6 is already in history

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

Change-Id: I23ea68c0217f2c1e06e6ebbcf17a92288be97cfa