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

Change-Id: Ib10de4c1d780dd52c336ca314dc2948fdd03befd