[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3 am: 440cdf38 am: 9f1a8089 am: 10e46e29 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367

Change-Id: Ieb75b5269fe8f0b8bcd1299a2acd3d7a6b16ed22