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

Change-Id: Icf2735a511ef790bda56678ead4d9d7755a84ad2