Merge changes from topic "setDataEnabled" am: a69bd1189e

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

Change-Id: I1e6fcd36be4aea8ca240af601b154a0804c50087