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

Change-Id: Id649a4f73b750d957eaa11b7ddf350c62b0d354a