Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05c7564d30de66489e976d6c1343f1e3b055ac67