[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure"...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3 am: 1c3a411a am: 8a847bee am: 077216b7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I222c89f4fe2b7eb5be0baba3082a90ae41fe9ade