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

Merge "Remove ro.boot.vr references" into rvc-dev-plus-aosp am: 0bc287e4 am: 5fb1037a am: e1ce33e0

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

Change-Id: Id6444b764bc3e64b5109fbecbe896a0e104b6431