[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: 7c306257 am: 04f0de2d -s ours am: 534a5006 -s ours
am skip reason: Change-Id I5367b5715c797facd37736eee84651addbaa230d with SHA-1 f7f7cde4 is in history
Change-Id: I818d49794deb41180af8ff64c43446d06c823b78