[automerger skipped] Merge "Make generic of get/setMobileDataPolicyEnabled()" am: 612ab62645 -s ours am: 10f32d1ff3 -s ours am: 7fe672ad2e -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: I553f87739189de1d211c84ad8f841bbb873176c3
Signed-off-by: Automerger Merge Worker <[email protected]>