Merge "Add null pointer judgment processing to prevent restarting" into main am: 29c8fea7

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



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