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 am: 9389805d

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



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