Merge "Synchronize calls to mAbsoluteDeviceInfoMap" into main