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

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

Change-Id: Ic60a32e6cefab3807102f1ee2d6565a15e053a15