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

[automerger skipped] Revert "[Telephony mainline] Add SystemApi and NonNull annotation" am: 85fab6aa am: f0bf41cb -s ours am: 8ef65862 -s ours am: da714f25 -s ours

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

Change-Id: Ie31f690517bf0fa6545a7502c4cf2a4dc136469c