[automerger skipped] Merge "Customize the service class for Call barring" into rvc-qpr-dev am: c405e1d495 -s ours am: 938f690b2b -s ours

am skip reason: Change-Id I5945c7471df6ed9b93a1b368cb700582cd84a271 with SHA-1 e47388b2c4 is in history

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

Change-Id: If863141ed652d2caa84e6963e6dcc47836992e4c