Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636779

Change-Id: Ie585b5c66b4e0f02e712fd4395a4f178ec908cba