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

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

Change-Id: Ib477477cca273d49cd880126acf9510b890773c8