[automerger skipped] Merge "Fix NPE: due to race condition between KCM package...

[automerger skipped] Merge "Fix NPE: due to race condition between KCM package update" into main am: b60f19bf am: b166549f -s ours

am skip reason: Merged-In I946848ab7b03945c9c1a234a18ba8ca9db3c86e6 with SHA-1 123a55e9 is already in history

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



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