Use the system properties instead of phenotype since GMS can change the
values more arbitrarily for PH properties.
Test: manual
Bug: 149645847
(cherry-picked from commit 599079b381)
Merged-In: If0a716075597f45e95b8357480e4b4a7c52fbb2a
Change-Id: If0a716075597f45e95b8357480e4b4a7c52fbb2a