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

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



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