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

Change-Id: I066978bd0150c885f60ced73bdb118038b5c15cf