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

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

Change-Id: Ib73f601848362c071752046355f11c859a3e52b5