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

Change-Id: Ia348a99d14f34464ade058c805c6526aa838fcf4