[automerger skipped] Merge "SettingsObserver take in DataSettingsManager...

[automerger skipped] Merge "SettingsObserver take in DataSettingsManager instead of Phone as handler" am: b14c5fbb am: 8a689f3c am: c1889321 -s ours am: a1e4fb01 -s ours am: 29584a68 -s ours

am skip reason: Merged-In I747e5f9535fd90da4f6c0b9481447116b79635ee with SHA-1 42873e60 is already in history

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

Change-Id: Ic5153c86ad20b0ff0e8f7f5ce148e5999da140f4