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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d24c25a0ab4bde791d1ddba37b9f59c1c1b6bb7