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

[automerger skipped] Revert [Telephony mainline] Add SystemApi and NonNull annotation am: 7cb5ca8e am: 2a28f867 am: 94179e37 am: f1fec5d1 -s ours

am skip reason: Change-Id I0749492a5648dfa2fb83271f349a8370972f7032 with SHA-1 2d280f1b is in history

Change-Id: I41c97e9153db47523eb3755a4f910b39a8f5797b