Merge "Merge "Remove incorrect @NonNull annotations on getDrawable() and...
Merge "Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev am: d52c532d" into pi-dev-plus-aosp
am: 51b58b24
Change-Id: I61aae2f93b0aa0991b33ea376e4809ebce23df31