Merge "[Telephony Mainline] Use the new SystemApi for mainline"
am: 0e79e43d0f

Change-Id: I963b5b12255a7b8b400b5ddbd9cf27d48ad2e0b7