Merge "Regenerate API signatures to add missing nullability annotations" am: 0f5b246260
am: c7e4291429

Change-Id: I6e1f6dca7947922d1a6308ff52a3a7ea5ffaa507