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

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

Change-Id: I0e8e12f1514d597a9daebb91a7ab5f4728c274e3