Merge "Customize the service class for Call barring" am: c7184b47e5 am: 75f51e70d8

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1404708

Change-Id: I4cd9725b3049dc96a56a723902470fd89501b9f8