Merge "Update the mdpi and tvdpi resource files" into nougat-cts-dev am: f1922bee3b  -s ours am: 76e5a9dc51 am: cd87d42429 am: 9db49d176d
am: 96f18e7a13

Change-Id: I343e81698bbbc802c1f78e24c16fcd3100dbc731