Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39 am: 8a847beeff

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

Change-Id: I09084e7cdec799a9da4322cf1fcc720450b47586