Merge "Make PAIRED_DEVICE_OS_TYPE readable by 3p apps." into main