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

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

Change-Id: I72246d5cb8ef1da20831e98582efb55be2b964a9