tree 6812ff4153ea912d86a65223f7d2fc1c717bb758
parent d289d6bcebb12f13d4245a1c7be4778666e57b5f
parent 354102ce867c93a3d1909eb0591928127863a5fb
author Jack Yu <jackyu@google.com> 1646847852 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646847852 +0000

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