Merge "Avoid duplicate map lookups in RemoteConnectionManager." into main am: eecbc0b322

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

Change-Id: I06a29e5f4e29c7b7e8bf946cb109b5abf6566c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>