Merge "Returning the evicted element from CircularQueue. Calling destroy() on...

Merge "Returning the evicted element from CircularQueue. Calling destroy() on the returned element in CloudSearchPerUserService" into tm-dev am: dafb69ab am: 993bd4bd am: 53aa806e am: c767f628

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



Change-Id: I552d18ba573d9e20e6834131fd817d4a067c4ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>