Merge "Remove ro.boot.vr references" into rvc-dev-plus-aosp am: 0bc287e4ca

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

Change-Id: I06c714144586e8d5ed3cf171fce21f89c58f800d