Merge "Fix installd dump" am: 1dbd7a49cc am: 94a4a864d3 am: c13f3bd847

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

Change-Id: Ie2dd32d6e585f6a0baf4d06e0165eb51b118c11b