Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
am: 79936ddda4

* commit '79936ddda4c8d1709f736cda013070c3ab32db6f':
  Add consistent @NonNull annotations for drawable callbacks