Merge "Fix update job handling." into tm-dev am: 16e31447fb

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

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