Merge "lshal: separate timeout for hwservicemanager list"