Merge "Adding tvdpi assets" into nougat-mr1-cts-dev
am: 64a884f1f8

Change-Id: I2981c4550a0c94065893dd5dc380843a6ea35104