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

Change-Id: I3e57c0cd24ba6c46e9cd0d9cdc3aade4e0651f5e