[automerger skipped] Merge "Remove ro.boot.vr references" am: 774f5649 am:...

[automerger skipped] Merge "Remove ro.boot.vr references" am: 774f5649 am: 967861a7 -s ours am: cefec138 -s ours am: 2d6f42a9 -s ours am: 2b6f93b1 -s ours

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

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

Change-Id: Ibf519a9b871733223a7e7040df4135f3a553bca1