[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 12244f9042 am: 94f38577c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I61de73b764566426cc40dcd13d818eb4f2ef2e0e