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

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

Change-Id: I0751eb77a932052a2b4fbfa2be9cb75b24067e42