Merge "Remove vr_hwc." am: 968098aff5 am: bbf0b8f29c

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

Change-Id: I5d78e0a0d2934b7761895e7f4e493a3d78e5f223