[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde4...
[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde4 am: 110fe0f4 am: febd0873 am: d6580812 -s ours
am skip reason: Change-Id I5367b5715c797facd37736eee84651addbaa230d with SHA-1 8e852f52 is in history
Change-Id: I7804c7f837cc6e7eba6ea788b19b8c0b802ae970