[automerger skipped] Merge ab/7061308 into stage. am: 8c95afd563 -s ours am: 2bebf61f2d -s ours

am skip reason: Change-Id I1f3c96de396b9bfbdee7496ae8e4e6691b7f9a8a with SHA-1 a2594245eb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20192e878dfdd2ae019c64acfa9a75eaaeeeef30