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

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

Change-Id: I3f74453605dd2209f1a02cdf818050ea5cf25c80