[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 skip reason: Change-Id Ie748edbcc64e5f2eaef5081fd507eceb63ce127a with SHA-1 34bf903e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88785b3215b62b33f99161991b41df97c30f2a92