[automerger skipped] Merge "AppWidgetServiceImpl:fix NPE in...

[automerger skipped] Merge "AppWidgetServiceImpl:fix NPE in pruneWidgetStateLocked mthod ." into main am: cd53cb57 am: b3f11483 -s ours

am skip reason: Merged-In I00f8c12b5dec00eac6e50e2ef755742db3fe4521 with SHA-1 bb05e5fe is already in history

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



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