[automerger skipped] Merge "Use onUserDataEnabledChanged to set DDS" into...

[automerger skipped] Merge "Use onUserDataEnabledChanged to set DDS" into udc-qpr-dev am: aece4add am: b8ce0e92 -s ours

am skip reason: Merged-In I79fccc1fa2677e755a3987d93599ad7ca2b29067 with SHA-1 ff54af16 is already in history

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



Change-Id: Icb7639c928524873787f6ade614955374a62b3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>