Merge "Account for hotspot bounds in RippleDrawable projection check" into mnc-dev