Merge "Bump the timeout on IDumpstateDevice" am: 7e42d09344 am: 69f39bc1ee am: 5455e4fc0e

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

Change-Id: I07e804e142090970bff04081f813a5e71bfabcfd