Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev am: 9020ed08e1

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

Change-Id: I904330889de1da23b2d44c0a948b51e6d454fd76