Merge "dumpsys: dump multiple types of info in one run" am: 9c6e104763

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

Change-Id: I195b8538672702e391ebfb99cf1c510879fd0754