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

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

Change-Id: Ie710fb680f227751a63c82102ccfdbde967e343e