Merge "Returning the evicted element from CircularQueue. Calling destroy() on the returned element in CloudSearchPerUserService" into tm-dev am: dafb69ab am: 79b1a7ef

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



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