Merge "dumpstate: Add "MODULES INFO"" am: ce552630ea am: cd416f366f am: ecc7eb519f

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

Change-Id: I4efb85f13e6c16501d2394f089f8e8a4d7ab6a6c