Merge "am:fix NPE and potential infinite loop problem." into main am: 9a998417ab

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

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