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

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