Merge "Fix null running task info in SysUI tests" into pi-dev am: 997e7b7ea4
am: 1a78073397

Change-Id: I3dc53c8a0a5a6bca8b69f8e5b30002adc7042849