[automerger skipped] Merge "Remove extra messages in DataSettingsManager" am:...

[automerger skipped] Merge "Remove extra messages in DataSettingsManager" am: f481da98 am: a519bfaa am: 431d4844 -s ours

am skip reason: Merged-In Ia9ebbbfb9482319e8f7799d8175c4a0a74ce81a9 with SHA-1 9487331a is already in history

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

Change-Id: Iba41752f8d7264bf7ae9d5bef97da0921afdd463