Merge "Unregistering HIDL interfaces breaks VTS"