Revert "SystemUI: Fix SystemUIGoogle after r20 merge"

This reverts commit d9e31ff5f7405ffa3e5f6ad83115dacadf478bd5.

Change-Id: Ib2c49cec6f403111ad638b077595be1652222ce8
3 files changed