vs985: add ril subscription types

Change-Id: I9e47924dd5da711c8a9bba84418c27c4e270fef2
Merge branch 'cm' into HEAD