Merge "Handle hidl transaction errors in ConfigStore"