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

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

Change-Id: Id04ea331831e8b26ba99478848392b40a92548d5