Merge "Revert "[Telephony mainline] Add SystemApi and NonNull annotation"" am: f74abcb43c

Change-Id: I18220028b31bc3c4599a82531e51a4c88feba9a2