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

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

Change-Id: I1bc9e9d54e31b9f93741df47cd7b0da0de0a5e4c