Merge "Add missing nullability annotations." into stage-aosp-master