[automerger skipped] Merge changes from topics "isDataAllow", "set_data_enabled" am: 8e7f72bc31 am: a11464b776 -s ours

am skip reason: Merged-In I086d8e2fc777991934982a77e6db91e7d312f124 with SHA-1 ecc78c4a71 is already in history

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

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