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

Change-Id: I399faf9527c9e036a47d41f2cd9abcc69069605f