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

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

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

Change-Id: I5835833278185f204a952a878442dd33805170f0