Merge "frameworks/base: forward port DC-HSPAP support from cm-10" into cm-11.0