[automerger skipped] Merge "Fix a bug in the USAP Pool refill logic." am:...

[automerger skipped] Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570 am: 8151e4c8 am: 255e25fc am: f9b15d96 -s ours

am skip reason: Change-Id I2e46eae431a1d9671d31c29b3552cd0287c66239 with SHA-1 f5619806 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfe7ec2f4f72a5ed88f9b493330b7f94e74b7094