Merge "Merge "Adding support for 213dpi" into oreo-cts-dev am: 7d45270ad9" into oreo-mr1-cts-dev
am: de79054006

Change-Id: Ic24c7d9915a97478f1e0bc91df00602ab79ee1f1