Merge "Add unknown state in DataSubscriptionState enum" into rvc-dev am: fe5aa41e27 am: 45e4bbb8cf am: 0066af26f3

Change-Id: Id7325bfa5cc3a67dd9f732d701fcafee7d634b48