Merge "Add 280dpi resource to Theme test" into nougat-mr1-cts-dev
am: 04780170f8

Change-Id: Id0912cade8b796f929f41de0ecd293e211daa29a