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