[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: acb02a43 -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: acb02a43 -s ours am: a69b5bc0 -s ours am: 299a18af -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia541f2e3b5c9e99ee405697394621e8cda1940c4