Merge "Revert "Fix proper 360dpi assets for passing CTS test case in the 360dpi reference device."" into pie-cts-dev am: 90fa71b56f am: a381961f4d am: d5a3504c6e am: e806af21a2
am: ae72a62ae6

Change-Id: Iad41879a3c836f162baf7c03206a843f9f4607f1