Add some Nullable annotations. Bug: 75952916,74859770 Test: apct Change-Id: I25710263a1ba806d49ec11638dab00f3513631a8