[automerger skipped] Merge "Bugreport: Fix SystemUI service from being dumped twice 2/2" am: cd1ce760e8 am: 69a88f7381
am: c0d97071af  -s ours

Change-Id: Id0489cfb6f433da81d5facb563b9a16ede675d87