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: 3024bd90 am: c697ebca

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

Change-Id: I91dd902252f065b92e804084e3308a74bcc1be24