ServiceState: add support for DCHSPAP

Change-Id: Ib0a328652c14580718400b00146b770481be5458
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1