[automerger skipped] Merge changes from topics "enterprise_internet",...

[automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a6 am: d5718c7c -s ours am: 0c28c83b -s ours am: 5ec01f85 -s ours am: 310a04a3 -s ours

am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c41 is already in history

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



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