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

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

Change-Id: I08a087829408248e4005abff4027dc8a1f2a75ae