Merge "Merge "Update the mdpi and tvdpi resource files" into nougat-cts-dev am: f1922bee3b  -s ours" into nougat-mr1-cts-dev am: 4784563fe3 am: 143f800147
am: 978534cd32

Change-Id: If71572f68ed52290b2ac1ff6029e50643d414ecd