Merge "Remove vr_wm service" into oc-dev
am: 3bfcfeb12e

Change-Id: Ie8937890f4a689073b78ac593c706674dcc366f2