Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
am: 5be3647a9e

Change-Id: Ie0408d44a2641e704c18399c996aff7f996e2764