Revert "Revert "Revert "Always select the next higher density bu..."

Revert "Update getDrawableForDensity test to allow either of the..."

Revert submission 16132603-183136881

Reason for revert: causes post submit failures
Reverted Changes:
I42ff7cdee:Revert "Revert "Always select the next higher dens...
Id4a93f857:Update getDrawableForDensity test to allow either ...

Change-Id: Idcc4c7b909256c65bc0f4e7815bb2d9093e66830