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

Change-Id: I89d6d667c6dc90981150fb2a4d5973861f5e2252