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