Merge "176321: Handle @ColorInt and @ColorRes checking for method results" into studio-1.3-dev