Merge "Use tvdpi named density for 213dpi devices" am: bf8797bdbe
am: 790b9cda20

Change-Id: Ifa6582cfd2892afb2fc780d2f289a9e5c3412fb7