Merge "Bugreport: Fix SystemUI service from being dumped twice 2/2"
am: cd1ce760e8

Change-Id: I79083f6196481cbd8e4831c632d3e575a70db562