Merge "make sure all type of Item in DumpTarget contains component and package name b/36904684" into ub-launcher3-dorval am: 2a120d448e
am: 03a222ee86

Change-Id: If387af91576da16e69600f9f9f7fbadb713b9854