Merge "Fixes two data races in USAP pool management." into qt-dev-plus-aosp
am: bc5237a4f1

Change-Id: I62f7e9636c40fe38bc7d860a572024a8dccd3fb3