Handle potential incompatible schmea changes in mainline module rollback am: ca13cefe75 am: ba4227d591

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

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