Merge "Remove ro.boot.vr references" am: 774f56490b

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

Change-Id: Ib33a4f963f31a17ff55737c3d0c75f2465b1ade7