[automerger skipped] Make generic of get/setMobileDataPolicyEnabled() am: 58448e4a67 -s ours am: 4b2d885c20 -s ours am: 3203554265 -s ours

am skip reason: Merged-In Ia53a740e0490a473dfcfdf23a8e9cb8870cfec1f with SHA-1 107664710d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2377342

Change-Id: I8b76925889878cdde8daeb7cd7e1f371680b7960
Signed-off-by: Automerger Merge Worker <[email protected]>