[automerger skipped] Merge "Add @Nullable and @NonNull to module API" am: 04ee825346 am: d785329abb am: d2b4bbb15c -s ours
am skip reason: Change-Id I71fb766d02f833ed9a1b3a7dbfbc1c8118882b30 with SHA-1 ca03ef4de6 is in history

Change-Id: Ib5bc634e527a6b779593ff528e56239beee73559