Merge "Merge "Add targets for tablet/tv product variants" into tm-dev am: 04f59c26 am: 58b58904" into tm-d1-dev-plus-aosp