Merge "Fixing crash when activity doesn't have a window" into sc-v2-dev am: 1d70478e

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

Change-Id: I02784e24d95c52c2d54722193ee7f2efa992f41d