Merge "Remove vr_hwc." am: 968098aff5

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

Change-Id: I557350298687076c9ba10f14c5c1e868e58ebfc7