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

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

Change-Id: I1635df17b588590d093454ec4f7fbda6d115735e