tree 6c0b12ffc5c48dfd447f44b43b772d44eef04267
parent 4309ff2e875f73d0109dcc703dc4c8bc3eba6128
parent 938f690b2b9207443c3125ac4dc68c8c6f5c3f93
author Brad Ebinger <breadley@google.com> 1600461978 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600461978 +0000

[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