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

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

Change-Id: Ibd7a61d6b738531745ecea95d6383dff95130952