[automerger skipped] Merge "Make generic of get/setMobileDataPolicyEnabled()" am: 612ab62645 -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: Ie98e55f13fd16cb125d087a0ab697128a0e1f7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>