[automerger skipped] Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2" am: 99c685b0e8 am: ab618e00b2
am: 23626416d0  -s ours

Change-Id: I02c1a00c1b16ef28e5f7a54884dedff5f6d3f6ac