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

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



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