Merge "Fix potential crash issue in NonRequiredPackageDeleteObserver" into main am: 471e041b54 am: 39138d7684

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

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