[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3 am: 1c3a411a am: b0394acc am: 62240a1a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7136818bfa0e18e1650159dec808203091b860a6