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

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

Change-Id: I838237bca838cce69108b90469a68ee54db07e55