Merge "Merge "DO NOT MERGE: Add mdpi and hdpi assets for theme cts." into nougat-cts-dev am: 5c23ea398d  -s ours" into nougat-mr1-cts-dev
am: 018e1e8e56  -s ours

Change-Id: I358a896437a5ebc28ce43d9ac007b4c27ac98d8d