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

Change-Id: I804262bb84571ca46461afbeefd562d5dc804b7d