Merge "Fix an issue when empty the usap pool." am: faf1b1cf0b am: 9078248b75 am: 80f41edf05 am: 81dd7537eb

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

Change-Id: Ib59b0793f1bbcbb1a39ae15417598161550c95ff