Merge "Unregistering HIDL interfaces breaks VTS" into tm-dev