Merge "Add 260dpi resource to Theme test" into nougat-mr1-cts-dev
am: 810eb42c5a

Change-Id: I181e6b7f82c2835a06a0b7c64d4e07ce70019cc1