Merge "add Nullable annotation to TelephonyAPIs" am: 9ae1256396 am: b33299d9af
am: 6337aa0311

Change-Id: I8e4dd54b405101a33f73abd86a1caf355ec7c923