[automerger skipped] Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" into rvc-dev am: f489f199 -s ours
am skip reason: Change-Id I0749492a5648dfa2fb83271f349a8370972f7032 with SHA-1 7cb5ca8e is in history
Change-Id: I4559c84ba573ae9ae9ccebaa5d27f85238bf1501