Merge "Correct StartingWindowInfo for non-top activity." into sc-dev am: 6b43ea0a73

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

Change-Id: I7dd3ab48d7c58521af19a7718be320a7e580749e