Merge "[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd am: 31e3b9cb80 -s ours am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history" into qt-r1-dev-plus-aosp