[automerger skipped] Make generic of get/setMobileDataPolicyEnabled() am: 107664710d -s ours am: 5823a27912 -s ours

am skip reason: Merged-In Ia53a740e0490a473dfcfdf23a8e9cb8870cfec1f with SHA-1 1232010edf is already in history

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

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