Merge "Revert "Remove vr_wm service"" into oc-dev am: ef2d2a0d15
am: c442a70a7f

Change-Id: I17932bc13a52815ee05c6bd59cc0f8db989c0a41