Merge \\"Explicitly sets dumpsys timeout.\\" into nyc-dev am: 12af7d51a1
am: 76614b0120

Change-Id: I635605c043a2435382ac93fb56b6ec57d7a98778