Merge "Fix flag name 'android.companion.device_presence' typo" into main