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

Change-Id: I5a749fab6007fe4f17f6e9752eb0b9a35b9c0ea0