We have unified devices so lets go by ro.product.name

(cherry picked from commit b9ce5d30dc238eefedf945f3c5fd2f86b29be1ae)