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

Change-Id: I93c78adc229c8ecc90fe6a09343383c6a4fc88f6