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

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

Change-Id: I6d5e04471f756ee5544bb1f77cf1927f44d7715a