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

This reverts commit 36cd040b5d0ce7705050afa33606f558a450cf35.