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

[automerger skipped] Merge "Revert "[Telephony mainline] Add SystemApi and NonNull annotation"" am: f74abcb4 am: 4ec2d67e -s ours am: 7457290f -s ours am: d8fb9d17 -s ours

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

Change-Id: I807f8b355664291198938d554c3a0e75cd6a852d