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

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

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