Merge "Display "Service has been disabled" when query call barring,it has...

Merge "Display "Service has been disabled" when query call barring,it has turned on actually" am: 4aece627 am: 940ed91c am: 26766965 am: 512aafa9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab41136b0c91e13e2c1239c60773af6880027109