Merge "Fixed that data was created in suspended state" into sc-dev am:...

Merge "Fixed that data was created in suspended state" into sc-dev am: be447bc8 am: 9f1940df am: 6d70e94b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15331670

Change-Id: I8403e0e06da5e733ac7c94dee4df6cc9a342d9f7