Re-Merge packages/SystemUI. Earlier merge seems incorrect.

Change-Id: I0c5a6d01a572b515ec602b60df68d72ef6164477
108 files changed