Revert "Revert "Frameworks & SystemUI - additional DC-HSPAP support""

This reverts commit 59cd80fc70093bc768235e69526a3194ec587784.