Fix component management in VrManagerService.
am: 1f4f26b1d5

Change-Id: I2767c5d05cc567eebdc2441e7fa0953be4a8f636