[automerger skipped] Revert "[Telephony mainline] Add SystemApi and NonNull annotation" am: 85fab6aa74 am: f0bf41cbb9 -s ours

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

Change-Id: I69393c91a20fed98e2ae65dd5c9520874c277341