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

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

Change-Id: Idf58038dbc03ee8d29596b189918430153731b1a