Merge "Cleanup ContactsIndexerUserInstance" into tm-dev am: 56ace2f56b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/AppSearch/+/18336859

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