Merge "dumpstate: Fix required dependencies" am: 9a23df27d5 am: ddb4231578

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

Change-Id: Ic3d697e0c236e898d17881d16212a849fb236556