Merge "Merge "Merge "DO NOT MERGE: Fix VrDisplayTest" into oreo-cts-dev am: 92d3cbf146  -s ours" into oreo-mr1-cts-dev am: a105283771  -s ours" am: c21a039adc  -s ours am: 860845a319
am: f01f3261e6  -s ours

Change-Id: Iccc5d9d12561bcd78fcdd8d210a0d63fb8b83ba9