Merge "Bump the timeout on IDumpstateDevice" am: 7e42d09344

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2021231

Change-Id: I4a2798030bceabc49cc0496aa0b5daf62958ee69