Merge "Test that Resources#getDrawableForDensity propagates density" into oc-dev