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

[automerger skipped] Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" into rvc-dev am: f489f199 am: 937c2abe am: 6ff3c294 am: 042cba12 -s ours

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

Change-Id: I58e5a962d78ec4a79c9a73d4a4c62ee2ff21c3e3