[automerger skipped] Merge changes from topics "data_settings_manager", "tnf_migrate" am: 354102ce86 am: 75e5f89057 am: 687eaf6a3c -s ours

am skip reason: Merged-In Id5f0011a932a90dc695a6c9f653533fb7791753f with SHA-1 2c6c64659a is already in history

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

Change-Id: I1d2eb208ee88b759c9aff1a1cc7c9170cba29e61