Merge "Updated AndroidTV Template from DevRel" into idea133