Merge "Fix fail to remove VisibilitySettings when remove a schema." into tm-dev am: 87ee2935e1 am: 90ca3f2f36

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

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