[automerger] Merge "add 400dpi resource" into nougat-cts-dev am: 9e9f2f2461 am: 890ec3cc43

Change-Id: I987296d0fa91e55dc389d737294e4c68aef53bc8