[automerger skipped] Merge "[Telephony Mainline] Use the new SystemApi for mainline" am: 0e79e43d0f am: 963cbf575b am: 425cff82d3 -s ours
am skip reason: Change-Id I644ea6f9ac0e2c7e3222a07a6eff59d6b38831a2 with SHA-1 d48723b950 is in history

Change-Id: I884d22052830381dfabc45a443d5c4c339570efb