ServiceState: add support for DCHSPAP

Change-Id: Ib0a328652c14580718400b00146b770481be5458
Merge fix

Change-Id: If75cde030d2ecd4176783f0ce4caef81dc7fb304