[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 -s ours am: f5c82dc3 -s ours am: 1a950cb0 -s ours am: 85096117 -s ours

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

Change-Id: Id6c299a610169d011f850f354795c864de87f9ce