[automerger skipped] Merge changes from topic "setDataEnabled" am: b43f1dc0...

[automerger skipped] Merge changes from topic "setDataEnabled" am: b43f1dc0 am: 38bf0c92 am: ee7f357d am: e36940b5 -s ours

am skip reason: Change-Id I8672ab8861fdec1854427ee9ce5ad8eec8774608 with SHA-1 e6e49b59 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481057

Change-Id: Ib6f749fbad68a29cdca9ab4b01ded9d1d86cd473