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

Change-Id: I88efee4e2d11595d021b5279650e0b95fc22266b