[automerger skipped] Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" am: 9f48bdc383 am: ee1e3f4969 am: 07cf194254 -s ours
am skip reason: Change-Id I6b875142bc8308e582ea874e9c69d8bed11ae554 with SHA-1 d5093c71de is in history

Change-Id: Id4c5305c6fbcb3f85296c80ba68bf640972b32a1