Merge changes from topic "setDataEnabled" am: a69bd1189e am: 1069b067b5

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1480719

Change-Id: Ifed66fde0642e4653e0d5c52f372bc1ff8d8a41e