[automerger skipped] Merge "[Telephony mainline] Add SystemApi and NonNull annotation" am: 8e708ff380 am: ae95a26703
am: aeab4bda93 -s ours
am skip reason: change_id I619d6ba04cb28830e3995feb02ffcb592ff65818 with SHA1 fa86d5a012 is in history

Change-Id: I335fc017f6d18d039f2c51ce691f614015fd6c72