[automerger skipped] Merge "Add removeDataDisallowedReason" am: 3a870a45 am:...

[automerger skipped] Merge "Add removeDataDisallowedReason" am: 3a870a45 am: 06f35d9c am: 0fdec443 -s ours am: f1c4a575 -s ours

am skip reason: Merged-In I26340e769ab1b88a0edc78bde1c710626daa8b12 with SHA-1 269780fb is already in history

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

Change-Id: Ic10e3cfe0f3c0320b3bc7eae704083e1f693d722