Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev am: d35d3c98e4
am: 250262a313

Change-Id: I61df0091ee1785947cb01fde77bda1a5a0460e31