[automerger skipped] Merge "Revert [Telephony mainline] Add SystemApi and...

[automerger skipped] Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" into rvc-dev am: f489f199 am: 937c2abe -s ours am: 0dfa921a -s ours am: 124c375a -s ours

am skip reason: Change-Id I0749492a5648dfa2fb83271f349a8370972f7032 with SHA-1 7cb5ca8e is in history

Change-Id: Ideb370787b6e1d744150778e90cfb38b4a117a11