Merge "Customize the service class for Call barring" am: ce872e98 am:...

Merge "Customize the service class for Call barring" am: ce872e98 am: cdbb2d7a am: c54ab73e am: 8248366a am: 643dc6b8

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

Change-Id: I6e2e8d40fe3a2d58daa458c4531c9e5972fa9112