[automerger skipped] Merge changes from topic "setDataEnabled" am: a69bd1189e am: 1069b067b5 am: d465078693 am: 0dc67f1cea -s ours

am skip reason: Change-Id I54825a2b6932daf64d5b8da6e32d301f03a04de9 with SHA-1 95c07a9a28 is in history

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

Change-Id: I7ed5ff5617293446f55a3e2081bf7c5f97dd4fcc