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

Change-Id: Ie0793da779104d7c15d47738acbbc3d1ddbb22d1