Merge changes from topic "setDataEnabled" am: b43f1dc00b am: 38bf0c92d1 am: ee7f357d0c

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

Change-Id: I599441bb34ae1874c8b675484d4a05fcc18c2438