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

Change-Id: I21248a7e4fd97d73bcdf2e67f1255f58e5dc1429