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

Change-Id: Ie3ec80897b6c35326bdd1b40aeb6647f4d81955d