[automerger skipped] Merge "Add SystemApi and NonNull annotation" am: 79ca88e3b5 am: 13dc5222d1
am: c2cf55d35a -s ours
am skip reason: change_id I0e5c0e57c14dd18ab51d33a9552dba86ef4e6000 with SHA1 b27edd7ef2 is in history

Change-Id: I37b68c916024f63cb20dc4890b76d3372c1703b7