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

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

Change-Id: Ica2ad53b482b96d543e59ea8b145424c002f28b7