Merge \\\"Explicitly sets dumpsys timeout.\\\" into nyc-dev am: 12af7d51a1 am: 6a43a90aaa
am: dfa1865590

Change-Id: I041719846785c909e70f078c66f132fcc13512c2