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

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

Change-Id: I7c2074ecf612a6cdfcc9e9bfd314063771f60684