Merge "Customize the service class for Call barring" am: ce872e9898 am: cdbb2d7a40 am: c54ab73ef9 am: 8248366af0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404668

Change-Id: Ib41cdfcf5775dd91595c5fe20052826c7010f5d1