Merge changes from topic "setDataEnabled" am: b43f1dc00b

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

Change-Id: I1310b91027a5842ce6cf854580ea39954b26acd8