Revert "SystemUI: ExpandHelper AOSP Bugs"

This reverts commit 002eacf07d290fc3ca506eae8303c8d8923d8429.