Merge "ATMS: fix the NPE problem in case the dream activity fails to start."...

Merge "ATMS: fix the NPE problem in case the dream activity fails to start." into main am: 77b4da7b

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



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