[automerger skipped] Merge "Add missing calls to DataSettingsManager" am:...

[automerger skipped] Merge "Add missing calls to DataSettingsManager" am: 94525db2 am: cac7b659 am: d7170265 -s ours am: 3f1b8fb8 -s ours am: fd043fa9 -s ours

am skip reason: Merged-In Ifb6651546a5a6472575c244a09161cb931156746 with SHA-1 b24f4db1 is already in history

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

Change-Id: Ibd72a5ee2c5f15d8fcdde5421f3ae3bc0bbe5e8b