Merge "Still do dump() if we cannot get mServiceLock for a while."