Merge "Merge "Update the mdpi and tvdpi resource files" into nougat-cts-dev am: f1922bee3b  -s ours" into nougat-mr1-cts-dev