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

am skip reason: Merged-In I2e46eae431a1d9671d31c29b3552cd0287c66239 with SHA-1 f5619806 is already in history

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

Change-Id: I499837430203f5f198d7376168cb8c725c46ae4b