[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde49d am: 4e5b129705 -s ours

am skip reason: Change-Id I5367b5715c797facd37736eee84651addbaa230d with SHA-1 f7f7cde49d is in history

Change-Id: Ifcf6579b94196feb1d63ee7e1ebff0f878933bc8