[automerger skipped] Merge "Revert "[Telephony mainline] Add SystemApi and NonNull annotation"" am: f74abcb43c am: 4ec2d67e29 -s ours

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

Change-Id: I63abf8e5157c841152967d408a4b2eba9eba7964