We need to have extra properties we can check for this so they don't
conflict with the main ones for ro.product.{manufacturer|make|device}.
Bug: 197771575
Test: None
Change-Id: I63d57d59f3473beaa825b9f20e711f15d6280461
(cherry picked from commit 0f000ac305528059fc6ebdf4a3c82dd698ef4161)
(cherry picked from commit f46a1b9adcdaa103c394a2017a58e0ab6a6a4c77)