Merge "lshal: separate timeout for hwservicemanager list" am: 180bb92608
am: b67f970cfe

Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209