[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: b0d222b4a1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3eb9d351041b1cf01cf0e4a1f1b25754da6b6e5e