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

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

Change-Id: I6e2e8d40fe3a2d58daa458c4531c9e5972fa9112