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: a987949a am: e6d4936b

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



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