Merge changes from topic "gateway-connection-id" am: 03f00e5a52

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

Change-Id: I1f8c7f2c81a5088a0c91f59c3607a939d5d2e1d4