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

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

Change-Id: Id444bd4f7b15a985fa026bde136a15c0efab7d38