Merge "add 400dpi resource" into nougat-cts-dev
am: 9e9f2f2461

Change-Id: I1acd8245c55de0f9a93f5d672d475e54e4f45c10