[automerger skipped] Merge "Remove ro.boot.vr references" am: 774f56490b am: 967861a730 -s ours am: cefec1381e -s ours

am skip reason: Change-Id I0849c52d946d629db8dad3b52ed44c2c26b18d9b with SHA-1 c8da8ebfa4 is in history

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

Change-Id: Id10bdb1941da4f21b53180e78742e7b24a5ad52f