Merge "[Telephony mainline] Add SystemApi and NonNull annotation"
am: 8e708ff380

Change-Id: I120670aade09707e3d018bb3e5bae7663aee622e