Merge "Add 360dpi.zip for theme test" into nougat-cts-dev