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

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

Change-Id: I811752dc4ea7f7bf60bfdb0febbddb86d91c6ea8