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

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

Change-Id: I3f03090d2b432c12fb1cfebd4402996c9402ef9c