[automerger skipped] Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2 am: ed5beec2 am: de0ebb08
am: 488d37b2 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 4d1699da is in history

Change-Id: Ifdf538d94799e4978a0b62fac63bd128fc2e1b5b