Merge "Merge "Fix proper 360dpi assets for passing CTS test case in the 360dpi reference device." into pie-cts-dev am: 29f9c576f2" am: f73e9cc172
am: 221323a2ef

Change-Id: I7638d6c3accf624e5f3ceb65e5b42ac4b29acdfa