[automerger skipped] Merge "Revert "Adjusts the USAP pool refill mechanism.""...
[automerger skipped] Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev-plus-aosp am: e5bcf4ba
am: 27baa53e -s ours
am skip reason: change_id I1327a22d103452bed46d191ec2bafb72a5e095ca with SHA1 154e3488 is in history
Change-Id: Ia84d099922833f7713a5586090c94870b2b77f3f