Merge "Fix NPE: due to race condition between KCM package update" into main am: b60f19bf48

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

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