Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" into rvc-dev