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

Change-Id: Id6921412886e72fb70fdbb0b23806c88a6638ae4