[automerger skipped] Merge "Customize the service class for Call barring" into...

[automerger skipped] Merge "Customize the service class for Call barring" into rvc-qpr-dev am: 3d81f3e8 -s ours am: 64fda3af -s ours

am skip reason: Change-Id Ibce22d0d340ce648c0b6df411266d1c4fe537013 with SHA-1 03a1471e is in history

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

Change-Id: I1537b3a0f52047dfde272a8802f282e696542858