Merge "apilint: suppress certain nullability lints" am: ab911951ae am: a0ea746c9a
am: e028b90b92

Change-Id: I3d30fb4321ff14dba4cea56be7a06a4f660c8898