Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a6

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



Change-Id: I8650138a61c7445fa4c1d4b6029aca69d9854db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>