[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde4...
[automerger skipped] Change to using sysprop for vrflinger_test am: f7f7cde4 am: 4e5b1297 -s ours am: a7a30a03 -s ours am: e4cae3d1 -s ours
am skip reason: Change-Id I5367b5715c797facd37736eee84651addbaa230d with SHA-1 f7f7cde4 is in history
Change-Id: I7bedd8646f82c7fe39f13709a478fb9fffd434e5