[automerger skipped] Support isDataAllow correctly am: 7a6f112b am:...

[automerger skipped] Support isDataAllow correctly am: 7a6f112b am: 3065dfad -s ours am: 5f777fd8 -s ours

am skip reason: Merged-In I4c6323b5f250d74c29a767583da2673405224157 with SHA-1 7514e211 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2091573



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