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

Merge "dumpsys: dump multiple types of info in one run" am: 9c6e1047 am: 41cb4e4d am: 8fab4aad am: 0d460b6c

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

Change-Id: I07cff2b57ca7899be56e1d485914d7623955672f