Merge "Fix dumpsys log to have correct component name for VrListenerService."