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

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

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