Bug: 331884942 Test: build and check system property and config file at device Change-Id: I81b51823df591a3ff0a72b538d0e45cd904c7592