Merge "Skip GenericBootImageTest on TV devices. am: 5396ef3ff9" into stage-aosp-tm-ts-dev