[automerger skipped] RESTRICT AUTOMERGE am: 36e10a6d0d am: 166d31fe90 -s ours am: 650eed99b6 -s ours am: 2ae05ef107 -s ours am: 7a5d6ea498 -s ours am: c3cf0094c5 -s ours am: 5f6d3de3e6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icd001075f8c6a6bfe8edbce7ce7a9b17b0b368ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>