[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 12244f9042

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

Change-Id: I8395365c8163aebe3a2136e072c2bcb7851bd5df