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

Change-Id: Ic5e76ba7bde5966075fc657dc7ed21b97fd00299