[automerger skipped] Support isDataAllow correctly am: a3df977da5 am: 9a7439f812 -s ours

am skip reason: Merged-In I87c4de8504857691119d09fde7e822d1bb99a8bb with SHA-1 3e2ac6e18a is already in history

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

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