[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3 am: 912dc151 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d2ac657a1deb1d0bd6544df757888d301a5eef4