Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2"
am: 99c685b0e8

Change-Id: I5d93f3a8bfc1385e629e06848f672b14a2885e6f