Merge "Customize the service class for Call barring" am: c7184b47e5

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

Change-Id: I97f16c99b4d9c807965874df9533f8fef5683670