Revert to AOSP SystemUI and add features as needed

Change-Id: Ib3b0a54554edc01d55d16d1af5b91f65f160b5f5