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

Change-Id: I1cdc06fdb732e893ea4829a780efe2a931c74598