[automerger skipped] Merge "Improve remote connection logging." am: 560c97bc...

[automerger skipped] Merge "Improve remote connection logging." am: 560c97bc am: 6fc6f4f6 -s ours am: d7f7f43f -s ours am: 4a68a877 -s ours

am skip reason: Change-Id I916750e0f558db1eb9e581bab7a9fbc71f781709 with SHA-1 972a6ef3 is in history

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

Change-Id: I774054936e809ad57c9ec31e5d097dfb17c71387