Merge "Fix VrDisplayTest failure" into rvc-qpr-dev am: 76fc311541 am: 23658123e1

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

Change-Id: I252b512350effd78611b9fdff314692105f832e2