Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: 79c040eaa0 am: 98f434bb65

Original change: https://android-review.googlesource.com/c/platform/cts/+/1646460

Change-Id: Ib81c8fa9566f55d0d519c7f92eb74f8177f793b7