Merge "Fix an issue when empty the usap pool." am: faf1b1cf am: 9078248b...

Merge "Fix an issue when empty the usap pool." am: faf1b1cf am: 9078248b am: 80f41edf am: 81dd7537

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

Change-Id: Ib59b0793f1bbcbb1a39ae15417598161550c95ff