[automerger skipped] Merge "Add missing calls to DataSettingsManager" am: 94525db2 am: cac7b659 am: d7170265 -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: Ic40383a7caa17b2ede7732a8093c37d44424097b