Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev
am: 1d3d19f2e1

Change-Id: I031c5466fabd2992bbef8b1cfb0f7de5bdbfad10