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

Change-Id: I4542655fb830fb237b3f0c23523fb34a89d95870