Merge "Add unknown state in DataSubscriptionState enum" into rvc-dev am: fe5aa41e27 am: cb5dc4dff4 am: 49de389b98

Change-Id: Ifd469b8dbd27e5d76929b97c0badd9f07f8bdef2