[automerger skipped] Merge "Synchronize calls to mAbsoluteDeviceInfoMap" into main am: afddcaf939 am: 6701bd7c92 -s ours

am skip reason: Merged-In Ib900153cec1f5800f4aa2a77151d5b4d96d2460c with SHA-1 114f113db7 is already in history

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

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