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: I743af3c56aec67e1a9487235f1a4a4e64cbaf4a3