Merge "Merge "Add unknown state in DataSubscriptionState enum" into rvc-dev am: fe5aa41e27 am: cb5dc4dff4 am: 49de389b98" into rvc-qpr-dev-plus-aosp am: 56abbdd6ec

Change-Id: I56d0c3c798543c23593f07d52356361d448654f8