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

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

Change-Id: Ib17d461e9b04471c9b0d5fbfa4e064104bfe409a