Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline"
am: 9f48bdc383

Change-Id: I56a68821b4e12136481f303556c31f63fdbf825a