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

Change-Id: Ieab6b2ad648ff58b3bee7ffc8d4fbc3cfb516225