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

Change-Id: Id8a2bd3c93c38b466d87c1c9f09f63bf949efff2