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

Change-Id: Ic97e416874c2989ab293b69d54190a02f281a043