Merge "Invoke setDataEnabled instead of setDataEnabledForReason on R device" into main am: 7145c5c1fe am: 8d4145cc1f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742354

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